Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Sep 2011 18:20:36 +0000 (11:20 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Sep 2011 18:20:36 +0000 (11:20 -0700)

Trivial merge